Skip to content

8369140: GHA: Update macOS / x64 build to use macos-15-intel runner #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Closed
wants to merge 1 commit into from
Closed

8369140: GHA: Update macOS / x64 build to use macos-15-intel runner #23

wants to merge 1 commit into from

Conversation

kevinrushforth
Copy link
Member

@kevinrushforth kevinrushforth commented Oct 7, 2025 •
edited by openjdk bot
Loading

Clean backport of GHA fix to jfx25u.

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8369140 needs maintainer approval

Issue

  • JDK-8369140: GHA: Update macOS / x64 build to use macos-15-intel runner (Bug - P4 - Approved)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jfx25u.git pull/23/head:pull/23
$ git checkout pull/23

Update a local copy of the PR:
$ git checkout pull/23
$ git pull https://git.openjdk.org/jfx25u.git pull/23/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 23

View PR using the GUI difftool:
$ git pr show -t 23

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jfx25u/pull/23.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 7, 2025

👋 Welcome back kcr! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Oct 7, 2025 •
edited
Loading

@kevinrushforth This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8369140: GHA: Update macOS / x64 build to use macos-15-intel runner

Reviewed-by: jvos

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 1 new commit pushed to the master branch:

  • 46039b8: 8367578: Additional WebKit 622.1 fixes from WebKitGTK 2.48.7

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot changed the title Backport e8820e2482bbc00765975854e738fdc214a46ea4 8369140: GHA: Update macOS / x64 build to use macos-15-intel runner Oct 7, 2025
@openjdk
Copy link

openjdk bot commented Oct 7, 2025

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport Port of a pull request already in a different code base clean Identical backport; no merge resolution required labels Oct 7, 2025
@openjdk
Copy link

openjdk bot commented Oct 7, 2025

⚠️ @kevinrushforth This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk openjdk bot added the rfr Pull request is ready for review label Oct 7, 2025
@kevinrushforth
Copy link
Member Author

/approval request GHA-only fix for macOS x64 testing. Needed to avoid the case where GHA builds stop working in a month or so.

@openjdk
Copy link

openjdk bot commented Oct 7, 2025

@kevinrushforth
8369140: The approval request has been created successfully.

@openjdk openjdk bot added the approval Requires approval; will be removed when approval is received label Oct 7, 2025
@mlbridge
Copy link

mlbridge bot commented Oct 7, 2025

Webrevs

@kevinrushforth
Copy link
Member Author

@johanvos Can you approve this PR when you get a chance?

johanvos
johanvos approved these changes Oct 14, 2025
View reviewed changes
Copy link

@johanvos johanvos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good that this is documented. It should be clear that we use GhA for some testing, but we don't use it for doing production builds because we don't control the version of the tools (e.g. xcode 15.4 on macOs 15)

@johanvos
Copy link

/approve yes

@openjdk
Copy link

openjdk bot commented Oct 14, 2025

@johanvos
8369140: The approval request has been approved.

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed approval Requires approval; will be removed when approval is received labels Oct 14, 2025
@kevinrushforth
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Oct 14, 2025

Going to push as commit 05d3a21.
Since your change was applied there has been 1 commit pushed to the master branch:

  • 46039b8: 8367578: Additional WebKit 622.1 fixes from WebKitGTK 2.48.7

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Oct 14, 2025
@openjdk openjdk bot closed this Oct 14, 2025
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Oct 14, 2025
@openjdk
Copy link

openjdk bot commented Oct 14, 2025

@kevinrushforth Pushed as commit 05d3a21.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@johanvos johanvos johanvos approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

backport Port of a pull request already in a different code base clean Identical backport; no merge resolution required integrated Pull request has been integrated

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@kevinrushforth @johanvos